x86: Add -Wredundant-decls to Xen build flags.

Fix up the fallout.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index d8663a6184b4c0d2b0941dd5144563057d727af1..ec3abdd2beac7b1ce2468dd66b4e35fb5149384d 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -16,7 +16,7 @@ ifneq ($(XEN_OS),SunOS)
 CFLAGS += -nostdinc
 endif
 
-CFLAGS += -fno-builtin -fno-common
+CFLAGS += -fno-builtin -fno-common -Wredundant-decls
 CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
 CFLAGS += -I$(BASEDIR)/include 
 CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic

diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h
index ec34170ce15842820d04512d33a3fdd7f6273e9b..57e7a16d63dfe6685d00f12caac0bd3c94273262 100644 (file)
--- a/xen/arch/x86/cpu/mcheck/mce.h
+++ b/xen/arch/x86/cpu/mcheck/mce.h
@@ -170,8 +170,6 @@ int vmce_domain_inject(struct mcinfo_bank *bank, struct domain *d, struct mcinfo
 
 extern int vmce_init(struct cpuinfo_x86 *c);
 
-extern unsigned int nr_mce_banks;
-
 static inline int mce_vendor_bank_msr(uint32_t msr)
 {
     if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&

diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index 7a9421e7c675e52c5adcfec788fd94cc85618156..ae2d62009975448d41793c556e73acc7f4979bfc 100644 (file)
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -46,7 +46,7 @@ static uint64_t __initdata sinit_base, __initdata sinit_size;
 #define TXTCR_HEAP_BASE             0x0300
 #define TXTCR_HEAP_SIZE             0x0308
 
-extern char __init_begin[], __per_cpu_start[], __bss_start[];
+extern char __init_begin[], __bss_start[];
 
 #define SHA1_SIZE      20
 typedef uint8_t   sha1_hash_t[SHA1_SIZE];

diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index ad37cb3075f08a9a864d4a4a4bc9e3e0b5737c50..56e16e65c10ec70e5a7f07899d747a71f73d80ac 100644 (file)
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -1837,7 +1837,6 @@ static void dump_softtsc(unsigned char key)
 {
     struct domain *d;
     int domcnt = 0;
-    extern unsigned int max_cstate;
 
     tsc_check_reliability();
     if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )

diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 63ab58ccd407fbb142396a9888eae524246e20ad..2eedfc37691d2668adab301cd11d184dba006875 100644 (file)
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -97,30 +97,6 @@ idt_entry_t idt_table[IDT_ENTRIES];
 /* Pointer to the IDT of every CPU. */
 idt_entry_t *idt_tables[NR_CPUS] __read_mostly;
 
-#define DECLARE_TRAP_HANDLER(_name)                     \
-asmlinkage void _name(void);                            \
-asmlinkage void do_ ## _name(struct cpu_user_regs *regs)
-
-DECLARE_TRAP_HANDLER(divide_error);
-DECLARE_TRAP_HANDLER(debug);
-DECLARE_TRAP_HANDLER(nmi);
-DECLARE_TRAP_HANDLER(int3);
-DECLARE_TRAP_HANDLER(overflow);
-DECLARE_TRAP_HANDLER(bounds);
-DECLARE_TRAP_HANDLER(invalid_op);
-DECLARE_TRAP_HANDLER(device_not_available);
-DECLARE_TRAP_HANDLER(coprocessor_segment_overrun);
-DECLARE_TRAP_HANDLER(invalid_TSS);
-DECLARE_TRAP_HANDLER(segment_not_present);
-DECLARE_TRAP_HANDLER(stack_segment);
-DECLARE_TRAP_HANDLER(general_protection);
-DECLARE_TRAP_HANDLER(page_fault);
-DECLARE_TRAP_HANDLER(coprocessor_error);
-DECLARE_TRAP_HANDLER(simd_coprocessor_error);
-DECLARE_TRAP_HANDLER(machine_check);
-DECLARE_TRAP_HANDLER(alignment_check);
-DECLARE_TRAP_HANDLER(spurious_interrupt_bug);
-
 void (*ioemul_handle_quirk)(
     u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs);
 
@@ -1570,9 +1546,6 @@ static uint32_t guest_io_read(
     unsigned int port, unsigned int bytes,
     struct vcpu *v, struct cpu_user_regs *regs)
 {
-    extern uint32_t pci_conf_read(
-        uint32_t cf8, uint8_t offset, uint8_t bytes);
-
     uint32_t data = 0;
     unsigned int shift = 0;
 
@@ -1626,9 +1599,6 @@ static void guest_io_write(
     unsigned int port, unsigned int bytes, uint32_t data,
     struct vcpu *v, struct cpu_user_regs *regs)
 {
-    extern void pci_conf_write(
-        uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data);
-
     if ( admin_io_okay(port, bytes, v, regs) )
     {
         switch ( bytes ) {

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 37b3136b2a430e65ccc1a0a62d34f05af7279ad6..33cc3f3e32571a44e851091f68852609e713a113 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -20,6 +20,7 @@
 #include <xen/hypercall.h>
 #include <xen/errno.h>
 #include <xen/tmem.h>
+#include <xen/tmem_xen.h>
 #include <asm/current.h>
 #include <asm/hardirq.h>
 #ifdef CONFIG_X86

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 257f6bcf91287a65db49b3ba2b39585cfc60abb6..08616405cfd9f7a0ce777ad856defe4469e834f1 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -36,6 +36,7 @@
 #include <xen/numa.h>
 #include <xen/nodemask.h>
 #include <xen/tmem.h>
+#include <xen/tmem_xen.h>
 #include <public/sysctl.h>
 #include <asm/page.h>
 #include <asm/numa.h>

diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h
index 7c24013cc202a03e8faa51aadf264aca461091bf..bdc761d96ad31a620672df4c26421a400e2acbed 100644 (file)
--- a/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@ -556,7 +556,30 @@ extern void mtrr_ap_init(void);
 extern void mtrr_bp_init(void);
 
 void mcheck_init(struct cpuinfo_x86 *c);
-asmlinkage void do_machine_check(struct cpu_user_regs *regs);
+
+#define DECLARE_TRAP_HANDLER(_name)                     \
+asmlinkage void _name(void);                            \
+asmlinkage void do_ ## _name(struct cpu_user_regs *regs)
+DECLARE_TRAP_HANDLER(divide_error);
+DECLARE_TRAP_HANDLER(debug);
+DECLARE_TRAP_HANDLER(nmi);
+DECLARE_TRAP_HANDLER(int3);
+DECLARE_TRAP_HANDLER(overflow);
+DECLARE_TRAP_HANDLER(bounds);
+DECLARE_TRAP_HANDLER(invalid_op);
+DECLARE_TRAP_HANDLER(device_not_available);
+DECLARE_TRAP_HANDLER(coprocessor_segment_overrun);
+DECLARE_TRAP_HANDLER(invalid_TSS);
+DECLARE_TRAP_HANDLER(segment_not_present);
+DECLARE_TRAP_HANDLER(stack_segment);
+DECLARE_TRAP_HANDLER(general_protection);
+DECLARE_TRAP_HANDLER(page_fault);
+DECLARE_TRAP_HANDLER(coprocessor_error);
+DECLARE_TRAP_HANDLER(simd_coprocessor_error);
+DECLARE_TRAP_HANDLER(machine_check);
+DECLARE_TRAP_HANDLER(alignment_check);
+DECLARE_TRAP_HANDLER(spurious_interrupt_bug);
+#undef DECLARE_TRAP_HANDLER
 
 int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx,
           uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);

diff --git a/xen/include/xen/tmem.h b/xen/include/xen/tmem.h
index cc191105059ec27092fa86fcb9292ccf1e58b4ff..5dbf9d5681fa4bbe6edc37b24461140a25b1bf83 100644 (file)
--- a/xen/include/xen/tmem.h
+++ b/xen/include/xen/tmem.h
@@ -12,6 +12,5 @@
 extern void tmem_destroy(void *);
 extern void *tmem_relinquish_pages(unsigned int, unsigned int);
 extern unsigned long tmem_freeable_pages(void);
-extern int  opt_tmem;
 
 #endif /* __XEN_TMEM_H__ */